telepathyClient: Always clear pending messages on destroy

Since commit 82950ecea, we acknowledge pending messages when closing a
chat notification for a channel we are handling to prevent the channel
from popping up again immediately. While this isn't an issue for channels
we don't handle, the unread messages of the destroyed notification are
still considered for the messages indicator in the top bar, which is
clearly confusing (in particular when we end up showing the indicator
without any notifications in the list). As it's arguably correct to not
meddle with a channel handled by someone else, just reset the cache of
pending messages to address this issue.

https://bugzilla.gnome.org/show_bug.cgi?id=770888

diff --git a/js/ui/components/telepathyClient.js b/js/ui/components/telepathyClient.js
index f07e599c169182ab1c2f107ee71a9d3613233190..927ca456eac294925c48cef84e18878b1efee1ee 100644 (file)
--- a/js/ui/components/telepathyClient.js
+++ b/js/ui/components/telepathyClient.js
@@ -475,6 +475,11 @@ const ChatSource = new Lang.Class({
             this._channel.close_async(function(channel, result) {
                 channel.close_finish(result);
             });
+        } else {
+            // Don't indicate any unread messages when the notification
+            // that represents them has been destroyed.
+            this._pendingMessages = [];
+            this.countUpdated();
         }
 
         // Keep source alive while the channel is open